merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 17 Nov 2010 04:09:08 +0000 (13:09 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 17 Nov 2010 04:09:08 +0000 (13:09 +0900)

Trivial merge